Implementation: #[feature(sync_nonpoison)], #[feature(nonpoison_mutex)]
#144022
+1,034
−207
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-author
connortsui20
force-pushed
the
sync_nonpoison
branch
from
b45b493 to
deda5c5
Compare
This comment has been minimized.
This comment has been minimized.
connortsui20
force-pushed
the
sync_nonpoison
branch
from
deda5c5 to
19b1a2c
Compare
This comment has been minimized.
This comment has been minimized.
connortsui20
force-pushed
the
sync_nonpoison
branch
from
19b1a2c to
a259232
Compare
This comment has been minimized.
This comment has been minimized.
connortsui20
force-pushed
the
sync_nonpoison
branch
2 times, most recently
from
e130930 to
804d305
Compare
connortsui20
commented
Jul 18, 2025
There was a problem hiding this comment.
For reviewers: since this is a large file, it might be good to compare this directly with the poison::mutex module.
(for copy paste)
delta library/std/src/sync/poison/mutex.rs library/std/src/sync/nonpoison/mutex.rsdiff library/std/src/sync/poison/mutex.rs library/std/src/sync/nonpoison/mutex.rs
connortsui20
commented
Jul 18, 2025
There was a problem hiding this comment.
The git diff here is somewhat unfortunate, as I had to reorder the tests for things to make sense. All of the "duplicated" tests here are taken from the existing tests in the file, so there is technically nothing new here other than the macro.
I would ideally like to write some more tests (testing more panic behavior in nonpoison, better tests for the replace drop behavior), but this is already quite a large PR. (Also the panic behavior is already in the doc test)
connortsui20
force-pushed
the
sync_nonpoison
branch
from
804d305 to
b615348
Compare
rustbot
added
S-waiting-on-review
|
r? tgross35 |
4 tasks
connortsui20
force-pushed
the
sync_nonpoison
branch
3 times, most recently
from
c5133bf to
f633b62
Compare
Commits squashed from pull 134663.
This commit brings the `mutex.rs` file more in line with the current `poison/mutex.rs` file. Additionally, it ensures that all items are marked with `#[unstable(feature = "nonpoison_mutex", issue = "134645")]`. Some features that are currently unstable on nightly also have the "nonpoison_mutex" feature, but they have their correct feature gates commented out above. Not all of the current nightly features are implemented here, and that will happen in a later commit. Note that this commit will likely not pass CI.
This commit moves the duplicating test macro for poison and nonpoison locks into the parent module. Since it is generic for all locks (either it calls `unwrap` or it doesn't), we can use it for all poison/nonpoison lock tests.
connortsui20
force-pushed
the
sync_nonpoison
branch
from
f633b62 to
35fc4df
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Continuation of #134663
Tracking Issue: #134645
This PR implements a new
sync/nonpoisonmodule, as well as thenonpoisonvariant of theMutexlock.There are 2 main changes here, the first is the new
nonpoison::mutexmodule, and the second is themutexintegration tests.For the
nonpoison::mutexmodule, I did my best to align it with the current state of thepoison::mutexmodule. This means that several unstable features (mapped_lock_guards,lock_value_accessors, andmutex_data_ptr) are also in the newnonpoison::mutexmodule, under their respective feature gates. Everything else in that file is under the correct feature gate (#[unstable(feature = "nonpoison_mutex", issue = "134645")]).Everything in the
nonpoison::mutexfile is essentially identical in spirit, as we are simply removing the error case from the originalpoison::mutex.The second big change is in the integration tests. I created a macro called that allows us to duplicate tests that are "generic" over the different mutex types, in that the poison mutex is always
unwrapped.I think that there is an argument against doing this, as it can make the tests a bit harder to understand (and language server capabilities are weaker within macros), but I think the benefit of code deduplication here is worth it. Note that it is definitely possible to generalize this (with a few tweaks) to testing the other
nonpoisonlocks when they eventually get implemented, but I'll leave that for a later discussion.